treeviewcolumn: Remove cell_area parameter from _cell_get_size

Fixes #297

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index de68a66e4372a3243aefd6db2e8e199ad1f63356..79cc3ab5786c6ef3cc52bde7ff52b16a1c104e0b 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1365,9 +1365,9 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
    */
   gtk_widget_get_preferred_size (completion->priv->tree_view,
                                  &tree_req, NULL);
-  gtk_tree_view_column_cell_get_size (completion->priv->column, NULL,
+  gtk_tree_view_column_cell_get_size (completion->priv->column,
                                       NULL, NULL, NULL, &height);
-  gtk_tree_view_column_cell_get_size (action_column, NULL,
+  gtk_tree_view_column_cell_get_size (action_column,
                                       NULL, NULL, NULL, &action_height);
 
   gtk_widget_realize (completion->priv->tree_view);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 5db4a159e28eb69a0931ee3d8824b7cc9a0ae3da..c5218b14e02cce4eee867de81f18a3579f657085 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5669,8 +5669,8 @@ validate_row (GtkTreeView   *tree_view,
                                               GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_IS_PARENT),
                                               node->children?TRUE:FALSE);
       gtk_tree_view_column_cell_get_size (column,
-                                         NULL, NULL, NULL,
-                                         NULL, &row_height);
+                                          NULL, NULL,
+                                          NULL, &row_height);
 
       if (is_separator)
         {

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 13997d238382d003b58b967810b0be1a85fa7019..88dfae901d238e85f96b09fafde19fc0d28ecaf0 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2758,11 +2758,10 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
  **/
 void
 gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
-                                   const GdkRectangle *cell_area,
-                                   gint               *x_offset,
-                                   gint               *y_offset,
-                                   gint               *width,
-                                   gint               *height)
+                                    int                *x_offset,
+                                    int                *y_offset,
+                                    int                *width,
+                                    int                *height)
 {
   GtkTreeViewColumnPrivate *priv;
   gint min_width = 0, min_height = 0;

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 801c74862785adc6d0c1c3b0b658273ae07dac56..c9dc183592a40730ab98ee34291fabd76bca6f67 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -223,11 +223,10 @@ void                    gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewCol
                                                                  gboolean                 is_expanded);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
-                                                                 const GdkRectangle      *cell_area,
-                                                                 gint                    *x_offset,
-                                                                 gint                    *y_offset,
-                                                                 gint                    *width,
-                                                                 gint                    *height);
+                                                                  int                     *x_offset,
+                                                                  int                     *y_offset,
+                                                                  int                     *width,
+                                                                  int                     *height);
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_cell_is_visible     (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL